Fix handling of clutter_init() failures

clutter_init() fails under normal circumstances like
being unable to open a display connection, so it shouldn't
be handled with g_error() producing a core dump.

Clutter consistently produces an error message when
clutter_init() fails, so we don't need to print out any
error message.

https://bugzilla.gnome.org/show_bug.cgi?id=643910

diff --git a/src/run-js-test.c b/src/run-js-test.c
index 7ffa62c9ddf1ab6090bebd1dcd742b21ecedce0f..27cd400152eff2aad030ca8b34dd626ecf61f11d 100644 (file)
--- a/src/run-js-test.c
+++ b/src/run-js-test.c
@@ -78,7 +78,7 @@ main(int argc, char **argv)
   clutter_x11_disable_event_retrieval ();
 
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
-    g_error ("failed to initialize Clutter");
+    return 1;
 
   gdk_window_add_filter (NULL, event_filter, NULL);
 

diff --git a/src/st/test-theme.c b/src/st/test-theme.c
index aeb8adef38efee3f93caefb5fe67008252d4487e..db7f747ce928304f8764179ba3712f35606b3b71 100644 (file)
--- a/src/st/test-theme.c
+++ b/src/st/test-theme.c
@@ -427,7 +427,7 @@ main (int argc, char **argv)
   StThemeContext *context;
 
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
-    g_error ("failed to initialize clutter");
+    return 1;
 
   theme = st_theme_new ("st/test-theme.css",
                         NULL, NULL);

diff --git a/src/test-recorder.c b/src/test-recorder.c
index 2a684e15a540ba162e3f96a2f9af9f33837c2559..655c887db4bd86c34dfe7336c2d82a8225b5ba66 100644 (file)
--- a/src/test-recorder.c
+++ b/src/test-recorder.c
@@ -32,7 +32,7 @@ int main (int argc, char **argv)
   g_thread_init (NULL);
   gst_init (&argc, &argv);
   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
-    g_error ("failed to initialize Clutter");
+    return 1;
 
   clutter_color_from_string (&red, "red");
   clutter_color_from_string (&green, "green");